Merge tag 'upstream/2.12'
authorgregor herrmann <gregoa@debian.org>
Tue, 13 May 2014 20:05:51 +0000 (22:05 +0200)
committergregor herrmann <gregoa@debian.org>
Tue, 13 May 2014 20:05:51 +0000 (22:05 +0200)
commit8173b1d0b819ea9db460ef4aeff2d4e5bcf9c005
tree735e759be202e4330b95f2880662c708bde88e2d
parente5835cf4c2f88b7c91eb3ef5a2192763ceb7e534
parentd1f344b5951904274b7479e5c692158a010a4871
Merge tag 'upstream/2.12'

Upstream version 2.12